* lisp/progmodes/octave-mod.el (octave-mark-block): Move out of tokens and

fix open-paren-like token test.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61567b38de5d1d1584240e8a9c91c994a9fdcb74..e98e2a3bb722ff81a1b5fe546195970ffd585690 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/octave-mod.el (octave-mark-block): Move out of tokens and
+       fix open-paren-like token test (bug#12785).
+
 2012-12-04  Glenn Morris  <rgm@gnu.org>
 
        * mail/rmailsum.el (rmail-new-summary): Tweak for

diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index ab5a19f8a2fb897835e379c4d9fa9bc6f4633459..da40cf51be9c9dc073e9eb21b3f7e06e16c7fda9 100644 (file)
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -794,11 +794,14 @@ does not end in `...' or `\\' or is inside an open parenthesis list."
   "Put point at the beginning of this Octave block, mark at the end.
 The block marked is the one that contains point or follows point."
   (interactive)
+  (if (and (looking-at "\\sw\\|\\s_")
+           (looking-back "\\sw\\|\\s_" (1- (point))))
+      (skip-syntax-forward "w_"))
   (unless (or (looking-at "\\s(")
               (save-excursion
                 (let* ((token (funcall smie-forward-token-function))
                        (level (assoc token smie-grammar)))
-                  (and level (null (cadr level))))))
+                  (and level (not (numberp (cadr level)))))))
     (backward-up-list 1))
   (mark-sexp))